Track my frameworks_base & fix branch on system_core

Change-Id: I4e48dfc582ac604229bc58e74091fcbfaa6bc93e