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 am: 34e4be660f  -s ours
am: 17c058a2ee

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