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

Change-Id: I941cabb11f6221eb8cb00487058145e6e83d4330