Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()" am: da75e38817 am: 20a71e4a90
am: af4651f75f

Change-Id: Ifa3bb90eeb3393f70a6263711073c58186e09a77