Merge "Replace SkALWAYSBREAK with equivalent Android macros."