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

Change-Id: Ic53ea8c705a67cec8b9d880efdb07ae247ecb176