Merge changes I210acb81,Ie9508788

* changes:
  Make NgramProperty have NgramContext.
  Create .cpp file for NgramContext.