Merge "Forbid javascript- and file-scheme intents" into lollipop-dev