Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev