Merge "Checks AIDL version matches manifest."