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