Merge changes from topic 'am-b01079a28be1492382951291689043df' into marshmallow-cts-dev

* changes:
  Merge changes from topic 'l1' into lollipop-mr1-cts-dev am: bd82863e0f
  DO NOT MERGE StagefrightTest: add test for OOB write in sonivox. am: 255ec553e9  -s ours