Merge "Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3 am: 550d5da702" into oc-dr1-dev-plus-aosp
am: ec643782bc

Change-Id: Ica7f5ac12650a25e0955c2cb5a58fd3ce748e2d2