Merge changes from topic "audio_hal_tombstones" am: b20ae2f7f7
am: ecd7e40fa5

Change-Id: Icd321517f75205346c400f16be697d8714c3a442