Merge "[automerger skipped] Merge "Tell bionic when we overwrite argv[0]." into rvc-dev am: a7e0ff89 am: 490cd4e2 am: 04110e30 am: 14a20560 -s ours" into rvc-qpr-dev-plus-aosp am: f3449713 -s ours

am skip reason: Change-Id I25e31c5da33e529c750ef6f2e3f36ca62cf4d231 with SHA-1 94cc1b39 is in history

Change-Id: I5cc507a45262ce6134ed8982a51bd7390faa25ef