Fix "android create project" to properly set name in strings.xml

Layout was wrong too.

SDK BUG 2176634

Change-Id: Ibbec1c47037d4a6dd875953c1875daaac4f11106
2 files changed