Update scripts based on observed failures.

The scripts failed to deploy properly to a non-rooted, modern Android
phone (for reference, running Android 4.4 KitKat).