Merge "Convert libphonenumber to Android.bp"