Merge with AndroidBillingLibrary