Extracted from the tervigon build for android-3.1_r1 a.k.a. HMJ37 Change-Id: Idd914b3a4879174f98569b3a9bbb6cf3d48ef221