am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev

* commit '6d5a1afac2a7bca6b171261ca9b237c3a516e567':
  stagefright: change licensing headers on h264dec omxdl sources