DO NOT MERGE Changing configuration so we don't build with an odex file in buildbots.
am: a14c173365  -s ours

Change-Id: I79ba276a53adcc6d9303f7228d592414da1757d9