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

Change-Id: I876d17fb6661f40f7872be935289d20ff74c4653