Merge "Generate recovery.img for unittest during build time" am: bf885b6b21 am: 616db72209 am: f8802616b3 am: 591dcf9015 am: c9a52cd8c1

Change-Id: Ib7252329bb9890290d6752b82e7c9dc8af11f66e