update to 2.3.6 release (r5073)

Change-Id: If21ca192d6e931e77542a03eb7c817188f05005c
Add some missing mb funcs

Change-Id: Ib80ee94d0dad6bf91df780c43fdce6694a4e3d19
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
android: prepare simplified utf support

Change-Id: If3d194b79eb57c93f7ad26c4b5272066b2ee9035
fix some type warnings

Change-Id: Ifb153429f8129e4da35d7e3c3186e674e7330f8d