am 5e2ad74d: Merge "Fix for libcxx.mk"

* commit '5e2ad74d8dac9d0dd36fe2513aed34f2e3b007d9':
  Fix for libcxx.mk