Change-Id: Idfc6f88de7ee3c190a01c2196dc0bc4da91cbe4c
This makes the repo work with https://github.com/ejoffe/spr (and my temporary fork, https://github.com/leoluk/spr) commit-id:2b0916ca