Revert "Cleanup RRO enforcement in mainline device makefiles"
am: f90e453f36

Change-Id: Ibf18b0bd5754f8fec0ae3c0704c2e4cb1c37d74e