Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp * commit 'e37ab63221af94d69437741a3645fc0e14a680bc': Fix build on some linux machines
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp * commit 'e37ab63221af94d69437741a3645fc0e14a680bc': Fix build on some linux machines