Merge "Remove the repetitive warnings from the uapi headers."
am: 025fb33c9d

Change-Id: I98bb1dd996bd331948d0e2ec3b2acf17c2d3f4c3