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

Change-Id: If81a665edab407fba61fe2bb6a5f2dfa32b53716