Match config.xml overrides with vendor overlay and vice versa
Merge branch 'lollipop' of github.com:SpasilliumNexus/android_vendor_nexus into lollipop