Merge "Update base files script works anywhere."
am: 7d54744e87

Change-Id: I80dde3f30fad77e3e465c92fbe24143363df0ef4