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

Change-Id: I64b0f247c84b53c53f6ad04551264e4fa352f1eb