am 53138105: am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."

* commit '531381056fac077cffcd509b1e89d9b41f400fca':
  Don't adjust ABI if PackageSetting#pkg is null.