Merge changes from topic "metadata-audio-hal" into pi-dev
am: f2797b2275

Change-Id: Id0bf9df24f306026fd211b4e169093a079c7e4f0