am 913e0317: am a72e6f80: am 8a3f514d: Merge "Split the rules to build the odex file"

* commit '913e031793928981640f51fa2e6480312f044c37':
  Split the rules to build the odex file