Merge "Revert "Add launcher-log-proto-nano rule in Android.bp"" into ub-launcher3-master