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

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