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

Change-Id: I776f9640b7dd5eb9a810fc7ad75e7f03bd48049f