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

* commit '55a1c5d795cb590c1350a5b880829bf4290757d9':
  Rename android-M to android-23.