Android 5.1.1 release 7
Merge "Add new build rules for target libraries."