Merge "Change NNAPI time from steady_clock to boot_clock -- hal"