Merge \"stagefright: Enhance MPEG4 writer/extractor to store/retrieve layer info\" into nyc-mr1-dev
am: 0093efba5a

Change-Id: Ia1a316c8dfd13bf146e94037a3743cdab88acdfe