[automerger skipped] Zero-init HIDL core types (all) am: 38db64566e -s ours am: 6015a706d9 -s ours
am: 2d167e37a1 -s ours
am skip reason: change_id I3979232879bb437d17d3a6f6013b53b2951a2138 with SHA1 aa79ac59c8 is in history

Change-Id: I33b5f9d32dd8c5f831c0d9d6ee68275c7b240a78