am 1b6f7c3e: am 143d4c3d: am 33cd57d4: Build against SDK 23

* commit '1b6f7c3e6448ed8708a0683d9816e09aec59f1ee':
  Build against SDK 23