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

Change-Id: I98b6243cf9815c5af79ed40761e06b6e39e62a92