Merge "Fix makefile error with ANDROID_BUILD_TOP"