[automerger skipped] Merge "Fix DRM includes" am: 46f3e8f929
am: 8cfc559350 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1 b01ef14470 is in history

Change-Id: I5c058a3d5183dbe21d4a0147190bcc7e8922abd9