frameworks/base/media: Fix conflicts in MediaFile type enumeration

fixes type confusion problems introduced by change: 82a6b49239fe5d9ce54e30536dfbb3ad8f9b036a

both DIVX and JPEG were assigned 31, and both EC3 and MID were assigned 16.

BIG UPS to pbeeler @ SaberMod for pointing us at the CodeAurora audio squish from CM as the culprit.

Change-Id: Ia3d1ec427af3ce02bd44631577c2f7698950c678
Signed-off-by: nuclearmistake <nuclearmistake@gmail.com>
Merge "frameworks/base/media: Fix conflicts in MediaFile type enumeration" into jb42