am 396025ca: am f4554e79: am 40ad715f: am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools"

* commit '396025ca7f5ea6062b403d54269cc3c5b42261d1':