Merge "Fix the build." into nougat-cts-dev am: 2e70eeb924 am: e74c75bbe0 am: f0ed42f853 am: ee6392a01e
am: fd6b51994c

Change-Id: I694753b2170b7321f1fe891292364dda6f66f74b