Merge "Update Android.bp with getdomainname"