Fixed compilation issues for LA after merging oe_master with location.lnx.1.0-dev.1.0. Change-Id: I7940429c369249ab9aa636fe9850c1281cf2dc01 CRs-Fixed: 995520