[DO NOT MERGE] Fix SHAs in IRadio 1.5

Tweak files in AOSP and update SHAs to match internal master.

Bug: 147379351
Test: update-makefiles
Change-Id: Iac00853bc00c003848b3d45ebb19d15c4f6fba0b
3 files changed