Merge "Remove LOCAL_SRC_FILES from RRO modules" into stage-aosp-master