am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev

* commit 'ba880da44c672e64f76a593ed96e514a56bc7c56':
  Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...