Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp * commit '3886333644467beeaf60c13fb94f242538067765': layers support