Merge "liblog: Update Android.bp for Android.mk changes"