[automerger skipped] Fix fuzzer template android_device register am: b6a202255d am: dd7e65c353  -s ours am: 3796c55c38  -s ours am: 04c272ab3e  -s ours am: 792500c6c9  -s ours am: 25763c1626  -s ours
am: c98bd3cb7e  -s ours

Change-Id: I3510cf98793f911ebd4b28c8b9518eae05f14fb2