Merge "Support *Options.inc in llvm tblgen" am: f01c9a63a2
am: 004f0641e6

Change-Id: I3b202a98a1083bbf957a191931e40752183dae94