Merge changes from topics "createapexdirs", "createapexrollbackdirs" am: 06126e1b6e am: 2e4d37b4f9
am: 5b4f415185

Change-Id: I431976f0d8e057964802a7fcf6c826d20b9c8a94