[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

Change-Id: I605cacdf7d1a7ff471095a3cd08862528fd56a1f