am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread

* commit '46468dde8d7f9bd42ad180c2882bff6ef98685cd':
  Support for <compatible-screens><screen> in ADT.