Merge "Specify stable AIDL version number." into power.lnx.4.0