Merge "Update frameworks/rs for LLVM rebase to r230699."