Bump recovery to 6.0.4.6

Change-Id: I692b104b28533532cc2f192db8b337c6c46c32b6
Merge branch 'cm-10.2' into martincz