Merge "Move out all framework-tests classes." into gingerbread