Merge "Don't try to strip a shell script" am: ff7e13c260 am: 3efedfae39
am: 94e8bf2da0

Change-Id: I914a88c318acd71e039b8afbab1fa5fcb4189361