Bump to 6.0 final for real

This reverts commit 0d33ee87839fc7a5d6ad2c3ece59b79518ae3997.

Change-Id: Ib88e3aadebe7130c1c0eeb4e18a6a9733a556af7
Merge "Bump to 6.0 final for real" into kitkat