Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"