Fix fountain and put the demos back in the optional build.

libs/rs/Android.mk

@@ -110,5 +110,9 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
+# include the java examples
+include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
+    java \
+    ))
 
 endif #simulator

libs/rs/rsVertexArray.cpp

@@ -191,6 +191,9 @@ void VertexArray::setupGL2(const Context *rsc, class VertexArrayState *state, Sh
         if (sc->isUserVertexProgram()) {
             slot = sc->vtxAttribSlot(ct);
         } else {
+            if (mAttribs[ct].kind == RS_KIND_USER) {
+                continue;
+            }
             slot = sc->vtxAttribSlot(mAttribs[ct].kind);
         }