Merge "Correct workaround for drawable references on API < 16" into nyc-dev