Merge "Increment platform-tools version to 29.0.4."
am: 2e9deae47f

Change-Id: I028564a3e441147305a6c1c028a5f3a3fce551df