Update to android 4.3.1 r1

and switch frameworks_av to ours again as it should have been