Update Android version.
Update for v6.0.4 release.