Merge changes I66e7593b,I73df936e

* changes:
  ANDROID: pvmfw: Make pvmfw.fragment highest-priority
  ANDROID: Clean up PRE_DEFCONFIG_CMDS (cosmetic)