Android CTS 5.1 Release 20 (3993894)
Merge "Add new build rules for target libraries."