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

* commit '82652b3c698abed5834e8f976c3dce6b3ea5f5e3':
  Build against SDK 23