Merge "Support to build apk odex for both arch." into lmp-dev