Merge "Merge "DO NOT MERGE: CTS Test for security vulnerability fix: potential OOB write in audioserver" into lollipop-mr1-cts-dev am: 0aba5c5b1e  -s ours" into marshmallow-cts-dev am: b6c6ae53ff  -s ours am: ba2fd2c6bc am: b6117e6241 am: 9102d973de am: fc8598d50d  -s ours am: d081d2f8e9 am: 2839a037b3 am: f72befad3f
am: 8dde4897ef

Change-Id: Iffd4b66a7a0cc987d6a8854258919255fdcd8cd9