Merge "Tell bionic when we overwrite argv[0]." am: bf7cb1ca91 am: 3811c9dcdb am: 4a713a503a

Change-Id: Ib1902e03fa552a7b6426c14cc9f0d4976222f18f