Allow /local to override static files as well

Bug 1328310

Change-Id: I51f069bc09eb83227154da970462c661bada8684
Merge "Allow /local to override static files as well"