Merge \\\"Remove all android kernel uapi headers.\\\" am: c5e5edc3dc am: 8418c10103
am: 8de088aa48

Change-Id: I820d948e1ebb37dbb4bcac70ec57a687156d1963