Revert "Updates for mr1.1"

This reverts commit 6c955a6ffe8da0ff024789a046bd303c2984d63b, we
can now go back to AOSP's HAL variants

Change-Id: I792eae47df3cca31900845f27eed6f8811440595