Merge commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-plus-aosp * commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690': layout lib tests cleanup
Merge commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-plus-aosp * commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690': layout lib tests cleanup