am f1018d2a: am 580b1703: am 6ee534bf: am 557639cf: am 2567045c: Merge "Remove SDK tools from build."

* commit 'f1018d2a2fa3bf61fa54cfaaa83a8df284d72f9e':