Merge changes I3bc46f80,Ic3126518

* changes:
  Upgrade AndroidFrameworkUid to be fatal error.
  Refine CompatChanges check and enable as error.