Merge "Docs: Update various paths and files for hikey"