[automerger skipped] clean_header: Run outside of $ANDROID_BUILD_TOP am: bc3e37ca23 -s ours
am: dbcd6f7d61 -s ours
am skip reason: change_id I48210ea1a0033228a9aaa4124d28247b07cee6d4 with SHA1 d12d6f67bc is in history

Change-Id: Ia13da2135add88a9fd51cd6b9dbd913cd06a30b8