Merge "Move bionic ("runtime") apex definition into bionic/."
am: 2244f40e51

Change-Id: Icfeda2c65e81c6ed9dde7b038cf50d26eb6d63cd