Merge "Clean up Hal AIDL imports" into main