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

Change-Id: If9981752761bbe3a5f92120d849dd3643aefcdcd