Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
Change-Id: I29fe722b4eb9718765327902779046840a01433e
Change-Id: I1ff883375a0a769bf27a834c9bf04c6cdbb42117