Merge changes I02f65eec,I7b780f61 into pi-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/112661641
  [RESTRICT AUTOMERGE] Added support for feeding audio elementary streams to Stagefright