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

Change-Id: I9db35be9e19d51be23b540340bc5a1066ade0292