Fix user data issue, add test case to Android.mk