Merge "Cleanup RRO enforcement in mainline device makefiles" into qt-r1-dev-plus-aosp