Merge "Run boot HAL service as root" am: 72882f05ec
am: 22cb80d62f

Change-Id: Ia1d82f89d3374fbc2b92aedda78b930123a00351