Merge "s/staidl/aidl/" am: de18b338f8 am: 02e30acaf1
am: 65c3306786

Change-Id: Id698ebec3c2bb155d5ee73d90ee328bfa3c61060