Merge "releasetools: Fix the reference to OPTIONS.info_dict."
am: 0a5b59e78b

Change-Id: Id4f6669baa861f606d960bc9bb371c6ef728aa36