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

Change-Id: I9997004285d1299742c50b222edf9301be09fc98