misc change and add super.apk in userbuild