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

Change-Id: I5e84058df04af2d29ae85aaa8347543527642968