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

Change-Id: I5e4f45335343b7e63db587ad6f9bfaa5c5eabad1