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

Change-Id: I5dd42bb51a6e9e01f5fe7c204a1fabcfb947e6c1