Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications"