Commit 9e6ff7bb2ad2757e6cfef16fbb144f36e3ee7a0c

Daniel Stone 2012-09-11T14:27:54

Update Android.mk Squashed from commits by Helio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk> and Pekka Paalanen <ppaalanen@gmail.com>. Signed-off-by: Daniel Stone <daniel@fooishbar.org>