am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.

* commit 'f2dcbd2e72d4cd393a96d71457a14268e95b592a':