Merge "Remove LOCAL_SRC_FILES from RRO modules" into stage-aosp-master
am: 651b6ee8c5

Change-Id: I02487eee98057e0358c3136e27c2ac181b0264e7