Update build files to SDK r21