Merge changes Iac69dbb6,I564aa75f

* changes:
  [pm] consolidate part of InitAndSystemPackageHelper
  [pm] add dexopt helper