Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00  -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba am: 5857a47008" into nyc-mr2-dev-plus-aosp