Merge "releasetools: Remove dead parameter in GetBootableImage()." am: 8df4fea85f am: 2e3f1c5258 am: dfff1ac065
am: 59da2ee4aa

Change-Id: I9f150af5698c6dcab7d7f059f009f0fca15455c0