TEMP: Track my frameworks/base until vanir catches up

Change-Id: I7ce1b53bc114fe98d3881b923786284bbabfa84c