am 202c962b: am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."

* commit '202c962b0500be38014904c96e740b3e63ce8ece':