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

Change-Id: Icbdc40d50872eac8cb29fc144cf0618dccb33652