Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev am: 3fec5a6498
am: 3b361d8548

Change-Id: I717ef249e77045bb51a8d39fc20bf35850300f28