Update build for SDK 21.