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

Change-Id: If0d32e78f93bd49d6eb683cf3b7674a5dbf6b481