added Android.mk
moved Android.mk
moving string literals out of layouts
Merge 'moving string literals out of layouts'