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

Change-Id: Icf56545cd7f046d59841921a35f715e5b5812357