Merge "Build against SDK version 4 (Donut) to ensure compatibility"