Android SDK ADT release 20
Merge "DO NOT MERGE Modify browser file origin policy."