Merge \"Merge \\\"Don\\\'t hold on to AssetManager instances\\\" into nyc-dev...
Merge \"Merge \\\"Don\\\'t hold on to AssetManager instances\\\" into nyc-dev am: f8e99e72 am: ce9cf64e\" into nyc-mr1-dev-plus-aosp
am: 26a9bdae
Change-Id: Ia21e20df03b2f1704afa2716a526b933ab08fd5a