Merge commit '88fb78d2091764e1265976bdb7027f7785f0b33b' into eclair-mr2-plus-aosp * commit '88fb78d2091764e1265976bdb7027f7785f0b33b': layout lib tests cleanup
Merge commit '88fb78d2091764e1265976bdb7027f7785f0b33b' into eclair-mr2-plus-aosp * commit '88fb78d2091764e1265976bdb7027f7785f0b33b': layout lib tests cleanup