Update 3.0.1

Update the Android SDK to the latest, with merge conflicts resolved.