am c6c02ecd: (-s ours) am 4cfbf781: am bb9fcb1e: Merge "Remove gpttool."

* commit 'c6c02ecd2a243ec43b92fde36f2ed1cddafe755b':