merged jdk6backport(android) with master