Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am: 7a37f8945f

Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763