Adding common  code for instrumentation and robolectric tests

Change-Id: Ia338f0565868bb174ef5f6721924944792866be6
7 files changed