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

Change-Id: I5f0827e5fb7be19216938ce61fd678881f8b524a