Fix downstream Chrome OS build. am: a2ea1c2865 am: 98065ca4fd
am: 0d4d85a2ce

Change-Id: Ib1e2225680fb8537b4423c15d682a9cad1134c16