Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
am: 50b59ccafc

Change-Id: Ia61b5c353a0d8316319c9bd9e5723795cfe41957