[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 am: 490cd4e2 -s ours am: 8fceda33 -s ours
am skip reason: Change-Id I25e31c5da33e529c750ef6f2e3f36ca62cf4d231 with SHA-1 07ce3ccc is in history
Change-Id: Ie0584af37631ab6a5d9e325031da4172caeb240c