Updates to sync with robotium 3.4.1

9 months old changes