Merge "Remove flinger_headers"
am: e360fc92be

Change-Id: I52d6418cb16cedd0764a9a29f2807c8c2b7d9f4c