Merge branch 'android-master' into android-omap-tungsten