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

Change-Id: If2c68d0743444210ce3b9bff0cc30eca3da5b543