Update common_aosp.mk