Merge "Revert "trusty: Android part of dynamic app loader""