Merge "Revert "Fix vulnerability in MemoryIntArray am: a97171ec49" am: 43966dafb3 am: 498547ec6c am: ef435f6780 am: 31f2e91892" into nyc-mr2-dev-plus-aosp
am: 6a9d6a1695

Change-Id: Ie07e7c0d5b0c6c8ddfe4f168b48a0162d2e3ce41