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

Change-Id: Ie2ccf9c5552a6cd21887d0351bd94fcf70a3a8f3