Merge "Merge "Fix the build." into nougat-cts-dev am: 2e70eeb924" into nougat-mr1-cts-dev am: 4505c4374f
am: 1fda24e465

Change-Id: I4d9270df49d6b48436d86d153514e5cc0ab06bdb