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

Change-Id: Icdaca8bf5dad6591619bf7457619a2b215f00fd1