Merge changes from topics "createapexdirs", "createapexrollbackdirs" am: 3e1c0478b9 am: 0ad91e40ea
am: f243a3b105

Change-Id: I29b4de125231880894571a003791f02c58ce1049