am edd2eaf9: am be1aec0a: Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES"

# By Chih-Wei Huang
# Via Android Git Automerger (1) and others
* commit 'edd2eaf9c4af5622b84d119e0d6cf9cd207be0bb':
  Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES