Restore targets needed by libcore tests.
This is a partial revert of commit
52dc080fa19f38f2be89e5827649847d555598f0
to fix libcore tests.
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64
Flag: EXEMPT BUGFIX
Change-Id: I4503746e60430a54f568c489dae7244e78cad6a2