Merge "Error out if MALLOC_IMPL is defined." am: 1ae548d81d
am: 1559d44d1b

* commit '1559d44d1bd0e120d63e06ffe6eae479b35fc4b2':
  Error out if MALLOC_IMPL is defined.