Clean up our approach to Android.mk

Change-Id: I79cce78665953db4957c015d4b45506308519a60
Signed-off-by: David Greaves <david.greaves@jollamobile.com>