Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf0 am: 4955049a am: 11912440 am: fac32905 Change-Id: I52ad863baa35828408b61a7f2ec1d7fb4f67c121