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

Change-Id: Icce3239668d015eaff01c9f3366de20588325c8e