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

Android 4.3 Release 3.1

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