Updates android Facet to support modified package structure.