Revert "Do not rely on /data/apex"

This reverts commit 6314b1622e733be00557bf05bb3ad94a24a2b46a.

Reason for revert: The code was wrong.

Change-Id: I54949ce148777c4ec99e13baf105d06bfbd5e49f
2 files changed