Merge "libtoolbox_dd / grep: Android.mk -> bp"