This reverts commit a67d744a. Reason for revert: 4MB services.odex size regression bug: 161089758 test: TH Change-Id: Ifa6f89e2282a3cfd94056b3c409904b7bad77026