Merge "Fix ndk-build won't build if makefile has tailing whitespace in LOCAL_PATH"