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

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