Merge "Remove flinger_headers" am: e360fc92be
am: 5d7d263edb

Change-Id: I2cabe8718a4a609d50041544cd84e2c014cc90eb