Eric's Android build changes.

Should really merge these in ASAP.