Merge tag 'android-4.3_r3.1' into jb3

Android 4.3 Release 3.1

Signed-off-by: iGio90 <giovanni.rocca.90@gmail.com>