Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662 am: be8d64294c
am: 978a3cf1aa

Change-Id: I4c89980bb4678a3ca0b108dc0920c57014cf91d7