Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected

Per parents.

Change-Id: I4419e19abac84f8f4e397c4ebc9d1cf2e1f6a945
Merge "Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected"