Prepare for E MR1 that is linked against L SDK

Change-Id: I77e735a824718e96eac49359ae195c0ffa76b83d
2 files changed