Merge "Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am: f8e99e72e7 am: ce9cf64eb3" into nyc-mr1-dev-plus-aosp