Merge "Switch to use SF cached source" into honeycomb-mr1