Merge "Include system_other.img in super.img by default"
am: 0fdd73b18f

Change-Id: I72a10d0a9eac2375f4e9e2fc4b5bac0f629662ff