Merge "Increment platform-tools version to 29.0.4." am: 2e9deae47f am: 5b0bfe3708
am: 10986b18bf

Change-Id: I27cde801790bea0b9c4e65481994793ac6a0c080