Pull our frameworks/base in

Reverted commits and found that the build error comes from this commit: eb53b8d45d3b7effaa92df0a143d9afd7b2df1c5