Update demo with fixes from OIT.
Merge remote-tracking branch 'upstream/oitDemo' into oitDemo
Update build files.