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

Change-Id: Ide195aee950ccd6ac2995cc389d3f55351c4e5d2