framework_(manifest|matrix).xml -> system* am: 5e9e45243e am: 5fe965e131

Change-Id: Icecd2b4b3464b542c8d215e4de5a19a6c181a7e6