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

* commit 'a72e6f80e447acf225822eebdf752c0d8aa2590c':
  Split the rules to build the odex file