Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"