Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
Bug: http://b/18556103 Change-Id: Ibccef334b4d1a2e68e327fc8b73e62e62d13df32
Change-Id: I8d5d7b6a49890e4707d70de8b429563de0d2ad99