Merge "Add a native library to test APKs" into jb-mr1-dev