Mpeg2 playback broken in Android 0.3.6 firmware in Kodi

[Blinky]

1080p Mpeg 2 video playback is broken in latest Android firmware 0.3.6
It now plays with ffmpeg CPU instead of AMCodec(Mediacodec) hardware accelerated in Kodi 17/18 and use 100% CPU.

Eg. 720x480 DVD resolution videos look much smoother now using ffmpeg to play but 720p/1080p plays with skipped frames since it is not hardware accelerated.

Can it be changed so under 720x480(DVD) resolution mpeg 2 videos play with ffmpeg but the rest play with Mediacodec hardware accelerated?

[Blinky]

It seems these recent changes broke it
stagefright-plugins in 0.3.6
Removing mpeg2 from system/etc/media_codecs_ffmpeg.xml doesn't help and
720p/1080p mpeg/mpeg2 is now software decoded(ffmpeg) instead of hardware decoded(Mediacodec).