Merge "Don't use ANDROID_BUILD_TOP in common_test.mk"