android-support-test provides a different version of junit FIXED=30481239 Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26 (cherry picked from commit d3868cfc)