Android Support Library release 11
Merge from AOSP

Change-Id: I0c9f2e0bb730a2e3f789d278aabd57965f0afea2