Android build fix

Since OS is transformed from android to linux, we need to ensure that conditions
specifying OS==linux are prevented from executing by additionally specifying
'and android_build=0'. 

This was done on most conditions in bnoordhuis patch, but I added a couple missed ones that broke the android build.