[automerger skipped] Change the condition for building super_empty.img. am: 06429d70 -s ours
am: 989d012b -s ours
am skip reason: change_id I277f087eab45663a6c3b33333d16e9e576c1c25c with SHA1 48a2feb6 is in history
Change-Id: I78b73e377c2da9b1fdff08eb9da03c3e99895697