Shuffle stuff where android wants it
Add build cruft
Vendor in PebbleKit, updated for my android version
Fix some broken references