Merge "Remove binderization toggle."
am: b380a9433e

Change-Id: Ie2264024e5c1588c72f750a40cdd5466309503f3