Incorrect resource files gives problems in Android Studio

These changes are supposedly not required in ADT but gives cryptic failures in Android Studio.

The commit message has the steps to use AS as well. Due to a bug in aapt.exe, this is difficult to find.
In addition to the patches (that should be used with ADT too), AS changes the structure. This is not committed right now.