Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs