Merge "Move the tool from /system_ext to /vendor am: b7e9354899 am: eb6974dd17 am: 462a37a6ce am: f9a84cccb0 am: 1191e1f588"