Resolves an abi diff. Bug: 152417756 Signed-off-by: Alistair Delva <adelva@google.com> Change-Id: I36e093ddcc1e2645e05a2a683ac52bd2f629dc35