Adjustments to android to match iOS. Added customDimensions and metrics for iOS.