Merge "Update DRM makefile." into oc-dev
am: 7c09a31639

Change-Id: I9c63fd23486a6e0a25b2fceee138343f0453d215