Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f
am: 54c8cb91b8

Change-Id: I0c8cd66738b37aabc3191449a99dc781b6132225