[automerger skipped] Support beta 4 system images. am: 93b2fa30 -s ours am: 48ff0959 -s ours
am: 2ec77879 -s ours
am skip reason: change_id Ic97d42c89ac011fa668f0edb23fbb6a13a486e57 with SHA1 eb9e6277 is in history
Change-Id: I244f1e93b28c4878ac406ff2f27b27ce4595635a