Compilation fixes on new AoSP

Change-Id: If551c856c1717e2708971568604ae9d7396706ba
4 files changed