Update frameworks/ex and system/extras to oxygen_1006

Change-Id: Id1168973762f52e6e5081132ab79b31966c4c09b