Merge "Update prebuilt build tools path" am: 405b73ea10
am: f51ed4020f

* commit 'f51ed4020fcabe9d7a8e7f72fb3852ff2871f0a1':
  Update prebuilt build tools path

Change-Id: I99082fbc8427454265e50ae2ca4235f48c426761