[automerger skipped] Merge "Using a test key to sign boot-debug.img if needed" into qt-dev
am: 7f608372 -s ours
am skip reason: change_id I870cb70c70b7d4d7a30b77bed58cbca6e007d5e3 with SHA1 26b0a26e is in history
Change-Id: I530f5bb3641f3f2f4833d2ccef78906c7fef2913