Try total google/master base -- EVERYTHING

Change-Id: I07de92a8e64e7935a43c571dd3f87b000b909567

Conflicts:

	default.xml