Merge "Increment platform-tools version to 29.0.6." am: 5a2498ede5 am: ad209cdcb6

Change-Id: I3496a8752df63a7287cae33478be323ae869291b