Merge "Pass --force-determinism to prebuilts." am: a65a41dcdb
am: 5ebe0370bd

Change-Id: I1bfa10a47babf096e56d879fa847285f1fda0200