Merge pull request #1 from nicholaschum/test

Add Android.mk so we can build masquerade inline