Revert "test: Revert "Fix paths to AOKP + CM""

This reverts commit 4315b12c26ca7a064161e38df6e3c09e96bb5b8d