Android 3.2.6 release 1
Merge 4c0d3b51

Change-Id: I11384be619b8147cc0a335ee134eb6e91a495398