Log Message:
Split options into options.mk

(No functional change - this is just moving option lines to options.mk
and .including them.)