Merge "add r to eng and userdebug builds"