am 578a9efd: Merge "Raise API level to 23." into mnc-dev

* commit '578a9efd837896a0abcd49b5152f106fb55f4608':
  Raise API level to 23.