Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c
am: 68b580f346

Change-Id: I95ed12e6c619397a1434d30c714f8f8424036647