Merge "Remove kIsVdexEnabled."
am: eab2b429ee

Change-Id: I076a7f9bea6409d33cd9161dfda44bc594d14119