Merge "Use OUT_DIR_COMMON_BASE if OUT_DIR is unset."
am: 6604075701

Change-Id: I78166f0227bf244838051328a76682d9082f39a4