Further fixes for backports 3.19-rc1.

We had previously applied
to our tree. This change was not accepted upstream, and at this
point it nno longer works with the current upstream tree. The
merge with 3.19-rc1 removed part of this patch, this CL removes
the rest of it.

Change-Id: Ibf7fca09efa40e785a1f589d337b526571c8fcd6
2 files changed