Merge "Add test apex for sdkextensions" am: e1f2ed5995 am: 956402942c

Change-Id: I838ee0c3315cece6a4348cebe94b3b80ed63e911