Merge "apexd_prop is defined for PRODUCT_COMPATIBLE_PROPERTY = false case"