Merge "javac: rename common_flags to avoid conflictions"