Merge \\"Add Dolby TrueHD audio format\\" into nyc-mr1-dev am: b2fe804064
am: 4b09c6bc9e

Change-Id: I364e4320e1f43e155285b06177730bf07c6e3bba