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

* commit 'c3db771cac9a2d448f4f624ac410377c30fc6158':
  Raise API level to 23.