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

* commit 'd8e7c5f1246f3094772b7630d7df2b0554261c53':
  Help Robolectric find AndroidManifest.xml