Merge "Development Options: toggle binderized hals" am: 5f854f39a8 am: 8076dcde0c am: ec0e1fb59f
am: 7ea5b6d740

Change-Id: I2c9d79da43142e440f7c79b85904a94c2af65b76