SCHEMA-155. Merged Kiji and KijiAdmin.

Signed-off-by: Daisy Zhou <daisy@wibidata.com>