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

Change-Id: I8aa81c972d6be0a94aa08857b2258bb919fe38fa