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