Merge "Make OpenSLES_Android.h also include OpenSLES.h"
am: 6952bbc508

Change-Id: I0ebe915141878d153f07ccaefa60f27a8aeda5a6