am f61a9a84: Build against SDK 23

* commit 'f61a9a840eb5ec82faec8239ed398db7b2f5148e':
  Build against SDK 23