Merge "Help Robolectric find AndroidManifest.xml"