Fix mavenize-android.sh version, note about -g.
Fix Robolectric.directlyOn.
Clean up Setup.
Clean up some resource name resolution.
Merge branch 'xian/salvage-good-stuff-from-layoutlib'

* xian/salvage-good-stuff-from-layoutlib:
  Clean up some resource name resolution.
  Clean up Setup.
  Fix Robolectric.directlyOn.
  Fix mavenize-android.sh version, note about -g.