Android 4.2 CTS release 2
Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"