Merge "DAP: building system_other.img for retrofit devices"
am: aa615a1b2d

Change-Id: I17f628ddbf0c8ee0262c27c26ad4eb0640f8562a