Merge changes I5bfdcf90,I32b0ed5c into marshmallow-cts-dev

* changes:
  DO NOT MERGE: CTS Test for security vulnerability fix: potential OOB write in audioserver
  DO NOT MERGE: Test for bug 32915871