Merge "androidmk: make class+suffix into generic prefix" into master-soong