Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am: fd6b3c6da3

Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd