Merge changes from topic "revert-1209453-aidl-lazy-presubmit-XWVUKGNUHY"
am: f73651f6d2

Change-Id: I808593192f232da00551449e333ed73d986904c9