Merge cros/upstream to cros/master

Contains the following commits:
 37cb84b api: add new qrtr-types.h header (Andrew Lassalle)

BUG=None
TEST=None

Change-Id: I1bbe68e88f471ee83ed2096e39a9a8e303188a93