am f075bf8a: am f60145de: (-s ours) am f61a9a84: Build against SDK 23

* commit 'f075bf8a4ccc0ff618a5d917e8b05fdd8b9c9557':