Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871  -s ours am: 99c0cb2140
am: 3a8037d6b8

* commit '3a8037d6b825f37273791cb30cb78dbd61d030a6':
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase