am 649490e8: am 870d5f16: Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev

* commit '649490e868bc0606b98458cad8f09c5c8d84bd48':
  Add LOCAL_APK_LIBRARIES argument.