DO NOT MERGE Remove EMBMS APIs from 26.txt am: bc82674f7a  -s ours
am: 042fb8bca1

Change-Id: Ica17a81989e78703bbefa6eec754b20ad743c2ed