Android O MR1 IOT Release 1.0.12 (5501548)
Merge "find_java2: Fix array size calculation"