Merge "Remove armv5te target"