am 381df73d: am d7fd034b: am b052e5c7: Use AOSP borders by default

* commit '381df73d4e519332252b28c15e27562dcbd22561':
  Use AOSP borders by default