Merge "Move the Robolectric shadow config up." into oc-mr1-dev
am: efcc8be05c

Change-Id: Ie816d276fe196452f38c88ca1f944dd040f19321