Merge changes I2aedd1f1,I9bdf8d07

* changes:
  gn2bp: Cancel -DANDROID if it's not specified
  gn2bp: Added required include PATH