Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev am: 43896cbc02
am: eaf5301f5e

Change-Id: I956f6584dd04b00d4649f79fbd73f1e690c2a178