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

Change-Id: I2757c49330ac75055428666b4c905dbe530e2bb3