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

Change-Id: I8a9e8e1171e01afb34e4ed781f731d9a16a8d7b7