Merge "Android.mk: remove some build-log spam"