[waffle] [RESEND] Android fixes & silence compiler warnings

[Emil Velikov]

As requested, this is a resend of the two 3 patch series.
I've added the r-b tags, and the patches are coming directly from 
 $ git send-email -6
so I hope they won't be messed up again.

If they are, the series can be found in my github repo, branch 
for-chad/android-fixes

As a one-liner - patch 2 and 3 are "would be nice" for the maintenance 
branches. I'll leave the final decision to the maintainer :-)

Cheers,
Emil