Merge changes from topic "wait-for-aidl" into stage-aosp-master am: c53bc39904 am: 2941ff2cf0
am: c41f708e75

Change-Id: I3e2715cd75272a8f378173185dd4769866fcd78f