update android to return object instead of array, same as iOS