am: b88e8ddc * commit 'b88e8ddc': Extra generic type information to aid certain javacs. Change-Id: Iccecb4f4e91dcb142ce0df1caae01259721c2a14