Merge changes I78fc47c6,I1f5a1abd,I889f995d,Ia2384c4f into android-8.1

* changes:
  extract_utils: Fix regressions from 3f9b94cb67a88999f7747af8335c5e576939360b
  extract_utils: Fix makefile generation issues
  extract_utils: Split optional args with semicolon instead of colon
  extract-utils: Use LOCAL_VENDOR_FILE instead of LOCAL_PROPRIETARY_FILE