Merge "Revert "Fix vulnerability in MemoryIntArray" am: 1f06508bc6 am: 64b5725900 am: 60357eb6bd am: 590b77da13 am: 061d2b6cad" into nyc-mr2-dev-plus-aosp
am: 430e097e3f

Change-Id: I85d663a8d467af7547b8025b3fd8a344a3e5f0ab