Android 4.3.1 Release 1
Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"