This reverts commit 8281b5d7. Change-Id: I3ed6617ca890c8dfd537b645357d0344746e549a Reason: AddressSanitizer: container-overflow (aosp-master/aosp_x86_64-eng build)