Merge "Show version for APEXes"
am: 02f874d564

Change-Id: I5aff77a40b30d2d0acd5361c07c54ecdefa47f3f