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

Change-Id: I9630d692d9be5a170d731aaed236c7cf6cf67f19