Merge "Fix vndk snapshot suffix on Makefile" into rvc-dev am: bed2ac5d am: 195b2de5 am: fedd883f Change-Id: I23a54a50ac8096d53c6ffdcf608b904c066008a2