Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d
am: 4955049ace

Change-Id: If720ddc218387369966a28f1c21c6f94ed75a74a