Revert^4 "Merge remote-tracking branch 'goog/upstream-master' into third_party_review" This reverts commit 58da75c2603f1588e18bf674e6423219e0afe42f. Reason for revert>: fix the license type Tested: https://android-build.corp.google.com/abtd/run/L05400030012642799 https://android-build.corp.google.com/abtd/run/L09300030012638467 Change-Id: I1b852936a1c2dc1b80d5d4ebf9fe5389d3bdbab3