am b052e5c7: Use AOSP borders by default

* commit 'b052e5c72d27c3da585e345d758170c3ab26cbc8':
  Use AOSP borders by default