Merge changes from topic "m" into marshmallow-cts-dev

* changes:
  DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts)
  [DO NOT MERGE] CTS test for Android Security b/37093318