Mostly just getting them running again, still a few failures related to native library symlinks that need more investigation. Bug: 18048725 Change-Id: I4642adab9fb2b9ec1488b700edcee48c09e36005