Merge "Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 116a4e883d" into nyc-mr2-dev-plus-aosp
am: 2e0e9363ac

Change-Id: I4c6d203601481a1f148a58df7c4ea9a9c55f00fa