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

Change-Id: Idc541561aacff37a5d0858d97bbcf266b68fc066