Merge "Rename android::apex functions"