am 36a95162: am cdd2af5f: am bf782628: Merge "Generate x86_64 symbols based on bionic 2014-03-19"

* commit '36a951624cc7078cdcccf7bc6045f1e3d0ce5528':
  Generate x86_64 symbols based on bionic 2014-03-19