Modified the sources according the latest changes in android-store.