am 0e43fe88: Merge "Help Robolectric find AndroidManifest.xml"

* commit '0e43fe886bc8b59d0ce08235c2e3fe6843ddb30c':
  Help Robolectric find AndroidManifest.xml