Merge "Increment platform-tools version."
am: 3a5fc22f69

Change-Id: I4f8f4bcdd717d841e0c44308db379485dcff4286