Merge "Rename android-M to android-23."