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

* commit 'ce21e4c2a3e863f3401012a7f450d30311e56e62':