(A lot of work was done on this thing, for a target that hasn't been compileable at least since we moved to git..) Change-Id: Ibface9392f3251b5be4bf1e0c4d12639c4f1662d