change guard to use ANDROID and __arm__, so it doesn't break non-arm android configs (e.g. simulator)
change guard to use ANDROID and __arm__, so it doesn't break non-arm android
configs (e.g. simulator)



csulmone/skia,csulmone/skia,csulmone/skia,csulmone/skia