Merge android 4.3.1_r1 into jb43-legacy

Change-Id: Iac560765a14228c45dff1426a96e74c7dce42716