Android O MR1 IOT Release 1.0.10 (5360514)
Merge "find_java2: Fix array size calculation"