Adding support for static html in build

Change-Id: I2734cadcfb32f0f755e8aa896472f6869e7ecced
Merge "Adding support for static html in build"
Merge remote-tracking branch 'github/master'