Android SDK ADT release 20
Merge from upstream sepolicy

Change-Id: I99085d575e3d884fb04ac03ac998eb3c53eb2d9f