Added .keep files so git doesn't butcher folder names to unix paths
Removed android functionality; it needs re-evaluation
Merge newer ZeroCore
Fixup code to work against new ZeroCore