tree a22ce8798b0782792d1e8e733ba630617b23fbe5
parent 84ad90000a04e4b7006bf7b2242423c32356ff8e
author Garfield, Tan <xutan@google.com> 1465510832 -0700
committer Garfield Tan <xutan@google.com> 1465578971 +0000

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)