Use separate dependencies instead of shared-deps

* Use Guava 16 for CDI compatibility (#13351, #13383)
* Use Android Json instead of org.json (#13277)

Change-Id: I4f2c2b5c56afb03d09b41a040dec7d60b4563fe8