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

Change-Id: Ibd6adf1f08bef5962bf58f6cd4bcefa198c02fb5