Update Android and Scala resources

@danrschlosser  Yay for separate json resources instead of being messily integrated into the code! Good job.