Merge "Prototype XML view compiler" am: 956791cee8
am: dcdd224bc0

Change-Id: I1920a587ab1dfb66f78123f68932fb7c7969fa40