Broke hikey build. bug:30933338 This reverts commit f290c01c. Change-Id: I3363d703c54d0f9b69197a29395cc08f60c8b2ac