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

Change-Id: I11c4ffb1a1bd4ddb83d211c73d9fab83aa4c22b6