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

Change-Id: Ia3287fa66cddb84877318739da6c97a1eab9fc93