fix odexed TARGET_UNOFFICIAL_BUILD_ID usage

Change-Id: I50e1ee7b4c851f6a2643d27187bc8b0e39b2f08f
Merge branch 'cm-11.0' into stable/cm-11.0