Add ARMv6J and ARMv6-VFP processor combo option

Cherry-picked from gingerbread branch.