Merge "Convert libphonenumber to Android.bp" am: 8b537942f7
am: 7d0c1e1535

Change-Id: I37d0a581bd95db7704d02b77679006d7cad7e7b6