Merge "Avoid position sensitive argument errors with tar"
am: 56f64eb28b

Change-Id: Iab6fb5018d227a3e55ad3b9e5e6b6c7449bb9da8