Merge "find_java2: Fix array size calculation"
am: 1400d85340

Change-Id: Ifaf8d2dd36565eaf400162604cde10f6d063e2ff