Merge "Improve Froyo ARMEABI Test" into froyo