[automerger skipped] Merge "Add -faddrsig to ClangExtraCflags" into...
[automerger skipped] Merge "Add -faddrsig to ClangExtraCflags" into stage-aosp-master am: afe46715 -s ours
am: efb4e863 -s ours
am skip reason: change_id I99511f038a6d4b88b5c849a0f8943c24731ab6ea with SHA1 1b0ba94e is in history
Change-Id: I42e6ab8c0699638abe1a51744a94f10b23c529fb