Merge "liblog: update Android.bp" into nyc-dev