Temp androidX support fix.
am: feae3302df

Change-Id: I1978d96bd0ca40d132060352557f154d14a90d76