Merge "Fixed array bug for proguard keep file generation" am: d98baeca50
am: 5ba4db04eb

Change-Id: I6350fbe20f30f51e79d0de8e85f759b4517ce9c6