Merge "Update installd to new compiler filters." am: f41404045a am: d9cfce8e4d
am: 685d22015a

Change-Id: I6679c0a2c8ad13ce22d9ac877f394153b6fae433