Bump recovery to 6.0.4.6

Change-Id: Id2b373e5a356e7eaa8694e5d0300dff860762061
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0