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

Change-Id: Iedd72ea40a2e1edfd3c4792098486a9daef44a1c