Fixed Android JUnit Test dependencies.
Merge remote-tracking branch 'origin/master'
Merge. Android JUint Test dependencies fixed.