Merge \\\\\"Merge \\\\\\"DO NOT MERGE: Reduce CTS audio requirements for low memory devices\\\\\\" into lollipop-mr1-cts-dev am: fec1a08bba  -s ours\\\\\" into marshmallow-cts-dev am: 08bcb89e03  -s ours am: c752176cb3 am: 485c050dd8 am: 608685f969
am: 03f4e1d2df  -s ours

Change-Id: I731bddc8c6ac8485d69e0db84775cf285fec9beb