I'm pretty sure I had done this before... Must have been new dependencies that slipped in when L merged in. Bug: 15193147 Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0