am b1bcf57e: Merge "Use the shared smali test infrastructure for 800-smali."

* commit 'b1bcf57e9fcaa95447fc3b9dfd7d0068e6106cca':
  Use the shared smali test infrastructure for 800-smali.