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

Change-Id: I0e3e2fe750e7b591738002ebfb63be1d0fc3f0c8