Merge "Remove LOCAL_SRC_FILES from RRO modules"