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

Change-Id: I5c9d7dee5c04eb1c7b564707d97338a04b6f03a0