Merge "Use latest gapps" into froyo