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

Change-Id: I0de7c338bbf351a756c7bbac1997338b59b8f9a8