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

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