Bug 879668 - Part 1: Make CreateMutedFrame static. r=roc
Bug 879668 - Part 2: Add utility function to convert codec data from OMX AVC/H.264 encoder for MP4 container writer. r=roc
Bug 879668 - Part 3: Add OMXCodecWrapper. r=roc
Bug 879668 - Part 4: Add OmxVideoTrackEncoder to file OmxTrackEncoder. r=roc
Bug 879668 - Part 5: Add OmxAudioTrackEncoder to file OmxTrackEncoder. r=roc
Bug 879668 - Part 6: Add build flag for OMX encoders. r=gps
Bug 952217 - Add NFC Manager permission check for NFC Manager APIs. r+sr=smaug
Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron
Bug 960350 - Display untranslated symbols correctly after merging profiles. r=BenWa

Also, set off the pid from the address with a colon instead of
hard-coding a field width, in case we ever get >16-bit pids.