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