Clean up and only using default.xml

Change-Id: I401852922defd01e0136189f66fd283dbed229e1
Add default manifest

Change-Id: I86c5f1ba211f099ac8bd7af16ab13762fa83b56d