Cherry-pick 7fb4cc from master. do not merge.

Build SDK with the new location for the system image.

Change-Id: Ic632d4ef87171fd4ed3e1a5bed9693fb402065c0
7 files changed