Merge commit '166ed46d' into gingerbread-plus-aosp * commit '166ed46d': Cherry picking changes from dalvik-dev