switch branches for frameworks base

Change-Id: I1d3bfbf4141b0bb4143d1f29421c648dd6b2af76