Merge "Delete Broken/Suppressed DatabaseCursorTest Tests" into froyo