[automerger skipped] Merge "Tell bionic when we overwrite argv[0]." into...
[automerger skipped] Merge "Tell bionic when we overwrite argv[0]." into rvc-dev am: a7e0ff89 -s ours am: 33fc705d -s ours
am skip reason: Change-Id I25e31c5da33e529c750ef6f2e3f36ca62cf4d231 with SHA-1 94cc1b39 is in history
Change-Id: I2d741f0de4484d4e49fbf5e5a95dd9d4da2c8ef6