Merge "Move libportable from ndk.git to development.git."