Merge "Change the naming policy of system_$(VER)"
am: 9f14cf2e49

Change-Id: I415beb7348054f6c9c626e435fd149f256ea8812