update to M4 for a final release before Android L

Change-Id: I334dab7b55acd131bf814d7a3a33693a8a533cc9