Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev
am: a01a7ff652

Change-Id: I5c4ebd6dfe86dfe827529a85c7a11b1c4a0e9e52