Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev