Merge "Add blueprint_tools as default target" am: 81787c1bbc
am: 2cbed51e36

Change-Id: Ic16e1eafd192ccdfbb32f34113f6eb50546b4fe4