Android 4.3 release 2.3
Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"