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

Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7