am 0de0b084: am e6a05bf1: Merge "Fix makefile error."

* commit '0de0b08490028ead3f34063da2e36dc8397376d8':
  Fix makefile error.