* Migrate Android JSON lib tests to use Robolectric and Junit4

Change-Id: Icf472c1b694cd7b19436b7b55626e8bc0eba9f0b

* Repackage org.json dependency to prevent link issue on Android

Change-Id: I1913914f3182f14963d7531115a30af08e4d9624