am be1aec0a: Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES"

# By Chih-Wei Huang
# Via Chih-Wei Huang (1) and Gerrit Code Review (1)
* commit 'be1aec0a4cdd9eca43656b2de289fc711b282caa':
  Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES