This makes the files match (AOSP ToT post-M) bionic. Bug: http://b/22068064 Change-Id: I100ac14afc06c2fe09ef5ecf9c2e3afa13b68c3b
Bug: http://b/21695943 Change-Id: I2b2f0e21a66093bdbbdbc0320ffa574eefaaf5fa