Merge changes from topic "audio_hal_tombstones"
am: b20ae2f7f7

Change-Id: I0a3bdff12daf9eaf059b5625a02bcc50f11fcf9c