Update to 4.3.1

Change-Id: I0649c6713a7fdbca4173e7241571b2756be80c7b
Merge git://github.com/CarbonDev/android_build into jb3

merge fork