Merge changes from topic 'n1' into nougat-mr1-cts-dev

* changes:
  DO NOT MERGE StagefrightTest: add test for OOB write in sonivox.
  DO NOT MERGE StagefrightTest: add test for bug 23270724