Merge "Restore LOCAL_PATH in sdkmanager/app/Android.mk"