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

Change-Id: Ic3d175656d485132aa8bc7cd3d1fd6de8428b211