Add/fix support for Android + related patches. Please see individual changes for details.
/cc @jerome