Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread