Merge "Update CPU implementation following tflite rebase."
am: 51b2395983

Change-Id: Ifda6ac477a442f4dc97e85da1888b657d5753a14