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

Change-Id: I8ec5a0d3d1519eec788604dbaa5e41b869b8d428