am ff469d96: (-s ours) am 657309ff: (-s ours) am ce076636: (-s ours) Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lmp-mr1-dev

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