Merge latest changes into hlte repo.

This allows building from the wip branches
elsewhere without the bowl full of bootloops.

Change-Id: I16cabab269b6b8788d6d821add4f8249050f0f8d