Merge "Use full path for LOCAL_INSTRUMENT_SOURCE_DIRS" into ub-launcher3-master