Merge "Remove FrameworkTest package." into froyo