Merge "Switch some build tools to Soong" am: c52d09e694 am: 8a78c90a95
am: 6fe82857b5

* commit '6fe82857b51db783a0a8c5ca48cca02ac53c9da7':
  Switch some build tools to Soong

Change-Id: Ibe38c84ff0e0be64a35a8b25f07881c8ac699f33