am bf539bf3: Merge "Fix makefile error with ANDROID_BUILD_TOP"

* commit 'bf539bf363c0361e3bac8ffd5e15c7ec8c514fdb':
  Fix makefile error with ANDROID_BUILD_TOP