Merge "Fix dalvik script to invoke dalvikvm with the right library."