Merge "liblog: Update Android.bp to match Android.mk"