Merge changes from topic 'l1' into lollipop-mr1-cts-dev

* changes:
  DO NOT MERGE: StagefrightTest: add test for bug 22771132
  DO NOT MERGE: StagefrightTest: add testStagefright_bug_21443020.