Android CTS 4.4 release 4
Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"