Upgrade support for /usr

In progress, need to finish fixing update_engine