Latest Android changes, nothing spectacular. Mainly committing to change directory layouts