Switch back to qcom/power

Change-Id: I00888b9a338f46f6b36db115bc36fd7b22303498
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
mako: Enable use of FFMPEG codecs for extended formats

Change-Id: I87c2fd47e15bef8382e10351ba3afef62b68cba1
Merge remote-tracking branch 'slim/kk4.4' into kk44s