[automerger skipped] Merge "Remove LOCAL_SRC_FILES from RRO modules" am: 5cacaef45b -s ours am: b5b95de2cf -s ours am: 25668fff13 -s ours
am: 7aa172da96 -s ours
am skip reason: change_id I2555c97f4ae98f6949837a19b4db4877cb38b607 with SHA1 d4ebd771a8 is in history

Change-Id: I319eb84de034aca880aa93577e66caabe70b1167