Merge changes from topic "soong_support_libs_deps"

* changes:
  Convert support library to Android.bp
  Always include static dependencies