am 33cd57d4: Build against SDK 23

* commit '33cd57d417d118d98f7ed6bd63d316beb690d970':
  Build against SDK 23