Revert "Cleanup RRO enforcement in mainline device makefiles"

This reverts commit 0affbe080bf78b556f2c3b8e8db32a619a9504cf.

Reason for revert: b/142350531

Bug: 142350531
Change-Id: Id7264e1193352c8472e40a2db18966c9677307a2
Test: lunch aosp_cf_x86_go_phone && m nothing
2 files changed