envsetup: Fix giant derp

Change-Id: I490556f18c40c3614e4e554d7db3306a16ff99d8
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2