Merge "Add Options.inc explicitly to TBLGEN_TABLES"