Merge "Move the latest AIDL update to the bottom"
am: fb08776087

Change-Id: Ic976eb8fa91644fc5a3bcadf2165bdf46af89088