Merge "Rename android-M to android-23." am: a21dd542fb am: 55a1c5d795
am: 1d4d5fb090

* commit '1d4d5fb090d82d698ae8e30df342dc397a5a5a65':
  Rename android-M to android-23.