am 05d0eea3: am 90f66ced: am 5f4469e5: am b0fedae0: (-s ours) am b0fe4ab6: am 1828e78f: Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into klp-dev

* commit '05d0eea38512a186f2d6ec0187adb02306a76247':
  DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls