Merge "Increment platform-tools version." am: 3a5fc22f69 am: 6eb2d6ef45 am: c5030bc2aa
am: 6460e55a3d

Change-Id: I9288d7640953db421a3e1d27669107c51673efe5