Merge "logd + liblogd to Android.bp"