Merge "Remove Broken LayoutTest Tests" into froyo