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

Change-Id: I35612147fad06e390887931d57325ae82976e4bf