upgraded from ics sources to jb 4.1.2 official source

Change-Id: I693bd1e85f52eafef12b3bd00f69b1f2d765d79c