Jarjar common dependencies of test apk and app apk to avoid class conflicts.

Also remove android-support-v4 dependency from test apk as there is no
dependency over it in test apk.

Change-Id: I0b459bb831dae6c03adfb4215a8f6a514fc72904
(cherry picked from commit 41f0641ee657215b3efa07c52698c0c4aa2ca1e4)