Reorder for GMS

Follow GMS guidelines

Change-Id: I24e36ff5ab3750bea5f715b71de9cabca1933765
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0